Merged
Conversation
Fixes break from apache#672, I merged without re-running unit tests :-(
Member
|
LGTM, will wait for the tests to pass and merge. |
Contributor
Author
|
Hm, build fails with same error - I can't reproduce that however. I did reproduce the original error, then built everything successfully after making the change above. Odd... |
Contributor
Author
|
Hm very strange - it looks as if the test hasn't pulled the change, see Copying the relevant lines as the above will be thrown away on next rebuild: @SuppressWarnings("deprecation")
public static BundleInstallationRestResult of(OsgiBundleInstallationResult in, ManagementContext mgmt, BrooklynRestResourceUtils brooklynU, UriInfo ui) {
BundleInstallationRestResult result = new BundleInstallationRestResult();
result.message = in.getMessage();
result.bundle = in.getMetadata().getVersionedName().toString();
result.code = in.getCode();
if (in.getCatalogItemsInstalled()!=null) {
result.types = MutableMap.of();
for (String id: in.getCatalogItemsInstalled()) {
// TODO prefer to use RegisteredType, but we need transformer for those in REST
//RegisteredType ci = mgmt.getTypeRegistry().get(id);
CatalogItem<?, ?> ci = CatalogUtils.getCatalogItemOptionalVersion(mgmt, id);
CatalogItemSummary summary = CatalogTransformer.catalogItemSummary(brooklynU, ci, ui.getBaseUriBuilder());
result.types.put(id, summary);
}
}
return result;
}Note the line which doesn't include the change linked above. |
Contributor
Author
|
retest this please |
Member
|
retest this please, after deleting the workspace |
Member
|
Tests pass locally, merging. Will investigate jenkins issue separately. |
Contributor
Author
|
Looks like it is fetching the apache master instead of the branch from my fork, as below. Note rather than from From build log: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes break from #672,
I merged without re-running unit tests :-(